Fix support library tests

Test: fixing tests
Change-Id: Ib5ef1581167905e957317fefad2fe6278918024b
3 files changed