Refactored L4 test package, ready to add more tests