Softcoding some tests

We are softcoding some tests to avoid future problems

Change-Id: I8fecb35d1aed7f4948379e524cc0b20bd0e23505