Added some waits and changed the steps a bit for issue 285