Added some test frames + fixed some remaining bugs