Add some action tests, fix bugs found by tests :)
more action tests added, more bugs fixed