Fixing and updating misc tests

Change-Id: I04c8a280df7c63f3abffafa88938916adbaeb352