changed tests using custom data types instead of lua modules
some cleaning up