Clean up naming convention; add tests