Finally passing 2 suback unit tests